Some more tidying of id stuff
Version bump