little bit fixes and comments