minor edits and commenting
Merge branch 'Alex'