fix wrong struct field name
fix masks for x and w_x data
Merge branch 'master' into rb14