rebase and misc