r18 updates

Disabled tooltip modifications (too many conflict possibilities)
Minor changes