address fix, tooltip tweak