changes for Gastil's most excellent code/doc review