cleaning up some things, making tooltips