A whole lot of fixes, including cli tools and configs for setup