Add benchmarking for vase as well as some fixes