whitespace, annotation, and bugfix