For the masking issue, you can use the general undo from the top toolbar (CTRL+Z). This will remove each step of the masking process if you make a mistake.