fixing variables and strings