Improvements to KitBotModel.