Quotes, indents
Quotes, indents, add test for BCC-only
Various small fixes and changes from SourceForge