fixing packaging and building issues.