Added Lava
fixin some things