Rebase fixes...
Improvments, cleanup.