small tweaks to basic status change flow