- cleaned-up distribution
 - minor fixes