Cleaned up a few errors

Still errors to fix. Still a bunch of weird ones now.