minor updates and improvements