fixes and comments
Updated comments