minor updates from comments