Tested the last of the shift-clicking changes, minor improvement to
machine processing