Added some new status to track.
Misc old changes that were never checked in for some reason.