added qtips, changed map, remove puts