cleaned/added features to some timing stuff
2 files changed