More find/replace errors
Find/replace errors and code formatting