error/warning distinction; cleaning up pluralization