Many changes, mostly to install and benchmark