Updates to get framerate and elapsed working.
Updates to get framerate and elapsed working.
Merge.