#169 minor fixes, comments