Feature/more distmappings fixes

I'm *pretty* sure this should fix #16.