assorted changes from Darius' review