Version hopefully works now
Updated some tooltip makers