Minor tweaks and update build and docs