Fixed status tracking. misc cleanup.