Final edits for -01

Primarily based on Paul Jones's review