Fixing more stuff

Don't accept these pull requests until you or someone wants the code or I give an OK. I usually notice errors in intervals of 8.46 minutes, so I will most likely make a pull request right after you accept one