slight improvements to input masks