fixed lava
final fixes