more changes to get status working