Geeble 4

Final minor fixes.