fixed gutterclick, and some usage of legacy functions