more fixes based on live server tests (and explosions)