Final fixes and comments