minor tweaks and improvements