Bunch of misc updates, including modular scale