Some fixes tweak and format updates.
Top