Fixed a lot of small things