+ruffus
+ tweaks, still WIP