made some more w1baw specific changes