fixed stuff and stuff