Fixes

The collection of things I fixed while using TA, minus a few things I'm not sure are necessary (so I'll put them in a feature branch)