fixed stuff, hopefully