fixes to comments and automated formatting + a couple of e-notices