some fixes, and bomb still has issues