We visited the Bund (old city riverfront area) a couple of times before starting the organized tour.  We also took a scenic river cruise.   It was the first cruise of its kind where there was no commentary in any language during the one hour cruise.