Fix: minor fixes and one which ipsilanti caught which screwed up his chum scripts