Refactored chaff but either broke something in the process...

...or exposed a bug in winnow?
Properly use append
Minor style fix
Make chaff smaller for now
Clarify TODO