Added basic benchmarks, minor fixes