Mostly formatting changes and minor tweaks for debugging.