Formatting and other small fixes.
Fixes