Assorted hacks by Atrus

Current hacks: