A few minor changes
Added some benchmarking code and files