A lot of formatting.

Added more tracing levels.

More Makefile fixes.

Minor other changes.