Cleanup some bugs.  Need to figure out why not setting ending status.