Fixed some things that I think were broken