more work on comments