Added some better state tracking and track details.