Fixed al the things that I think were broken