Added comments for the on the fly tree switch + todos