Fixed several Stuff