Dev

Bugs fixed and improvements