Some minor updates.

Looks like i need to rebase.