Fixed a lot of little things