Made the time metrics an option on the river. Refactored some of the code to make it cleaner