Fixing up stuff and other stuff