fixed issues and streamlined workflow