preparing for merge to head, new features (starttime graph, ...)