Fix a few typesetting things
Finish her off