more improvs

lava, etc.