Final fixes before merging the actual copy
Pulling from Anthony's copy