Added kits.yml
Various fixes