Adding some consistency and fixing some bugs