cleaned up comments
renamed vars
Fixed: control points are jumpy during connection sometimes, see #98