Add rebase and enhanced commenting.