minor fixes and comments