Fixes and push
Merge branch 'Austin's-Branch'