fix wrong struct field name
fix masks for x and w_x data