tweaks and initial Rebase functionality