more minor tweaking to context link code, +comment