more changes
fix some, break some