Final Changes

I should probably put quotes around “final”, but this should be close
to it.