Moonshine madness and some more little fixes.