link map done;
various improvements;