Remove old comments & add more Bomb code.
Fix final type error with new Component API.