Minor tweaks and version rev