Fixed timing bug
added graphing support