• fix problems reported by codetools