identify file fixes
simplify