Fixed Stuff

many stuff