adding tool tip, cleaned up datastructures