more changes, some things broken