Some cleaning up and a major commit in a long time
Some benchmark updates and minor bugfixes