Removed branches from some of the inner calcs, added scale gesture
detection (not quite there yet...), revamped the options menu.