copyright header correction, style fixes