Fixed some additional Stuff