Cleanup and updated dist.