added patch builder and small change clean up