Some more Kirby updates.