fixed stuff for 2-number versiobns, and branches