conformed to standards and squashed Werrors