More work trying to fix the things I've broken