Some refactorings and typo fixes and changed wording in a few places and added expected center of mass.