Revision

The big revision is done. May be a few smaller things, but mostly that's it. Merging it back into the Main.