Add timing library
Tidy up a few print statements.  In time these need to go completely but they are currently good for debugging.