Krabappel tweaks, see commits