[MOD] Minor tweaks so everything moves faster. 10 brownie points earned
credit to Nikh