Minor formatting fixes, some new debug messages