More dist manipulation, cleanup into @Basic, and build the readme.md