cleaned up some status logic.  works this time