US3 tooltips added and cleaned up code