more tweaks and improvements