fixed stuff, broke something