a few changes
Merge branch 'Final' of https://github.com/doughutchens/FatCat into Final