Got rid of some unnecessary changes and added comment explaining why tooltips were nil:ed.