Fixes and small enhancements.

Debug info, a few more flags.