add rebase improvements
Update title
Add feature files