Mathias Patches

Incomplete and untested patches dished out by the owner of Kaboom, Mathias.