Few style changes.
Bunch of changes and additions.