fixed stuff, changed stuff