Change to KitStalk and other minor changes