more tidying for queue and status