Minor fixes for timesteps
Merged conflict in BinaryTree.cpp