fixed some minor issues with masks