Improving model convergence and sampling speed

Thank you for the suggestions!