Fixed a lot of little issues