added beep
resolved merge confusion w/ white space, re-added gap mask and beep
scrolling w/ freeze