tweaks, masking and commenting