Issue #23: Fix issues with color formatting + comments (more to come)