Fixex shift-clicking issues

Closes #198