fix and break some more