Cleaned up status handling and streamlined a bit.