added basic tool tips
Basic tool tips merge