fix mask issue and controller mispeling