Lots of final changes, almost done!