Tweaked stall timeout, added sanity check for only 1 point with a location