add time macro
clean up digraph maros
update