cleanup to get to multiple file errors + cleaner line err msgs