update to -012 and some version alignments