Polish pass rebase

@AmbientOSX Does this look like everything?