General changes and improvements