More fixes, add Bomb Drop support