Some more changes and improvements