Complete Rewrite

All the duties of a proofreader plus: