Formatting & minor fixes.