more bug fixes including link redrawing