fix some, break some