Fixed and improvements