Fixed some Stuff