Added fixes and improvements