minor changes (tests, notes, maintainability)