dw 2.0: typo and check issues