minor changes and improvements