removing some old stuff, adding tooltips; Close #530