fixed tooltips, fixes to collections