Some fixes bugs and improvements..