More formatting changes. Mostly converted some DEBUG() calls to DEBUGADD()