resolves #19 remaining binning issues; resolves #21