Added some fun stuff with even more fixes