Fix a couple details

Finish rewriting ending, do some copy-editing