Lots of minor bugfixes & clarifications.