fixes and comments