mask check & fixes
mask check & fixes