Additions and fixes to comments