Adding more statuses.
Fixing compile errors.