corrections

coding standard corrections
additionally set a few nulls explicitly while I am testing other things