made tether more sensible and well-defined, cleaned it up