Moar tweaks and improvements