Added timing and changed some output.
Cleaned up some things.