minor update and improvements