More minor stylistic changes, and a bug fix