Now showing bombs is working.
Some code cleanup.