Fixed stuff
changed stuff