Add timer, more tree problems