fixed linting issues in patch, Rerolled patch #9, Attached interdiff for same...