changes to make packaging smaller. and a few minor adjustments