More tweaks and improvements