Touched up a bunch of small issues while working on Jester.