Integrated Phil's changes for bombs and coins into the incomplete version.