dw, bools, minor fixes