CopyRighteous - adding copyright headers, minor cleanup