fixed stuff, i think