Comply more closely to codepro cgmcandrews

Built and opened Janeway without a hitch, most yellow flags