fixed and improvements