Various tweaks from Kerbaltek.com