Added content to rebase explanation + other fixes