did some 1.6

did some quick work on 1.6