track elapsed time
fixes for tracking and err handling
fill in sources content support