Clean up patch comments, and add authorship for