worked some more on 1.2