tweaks and improvements