Clean up and add benchmarks
Merge branch 'master' into opengl