Cleanup dist

A bunch of small changes to clean up and improve the distribution.