added move tolerance to options, among other tweaks