More tweaks to Aero's mod