fixing some things, breaking others