fixed stuff and broke stuff