Some doc & style fixes/improvements.
Some more style fixes