Pushing latest set of changes

Finished proofreading and ready to merge