General cleanup of first 7 units.
Merge branch 'master' of github.com:OpenPhilology/phaidra