Fixed last problems

I will now make a release. (Hooray for us)