-Correct stream time update
-remove commented template code