Fixes to timing, and gglot2 dependency