consolidate patches, cleanup dist.sh