Changes for #14, partial changes for #17
Merge branch 'missing_distributor' changes for #14, and some of #17.