Fixed serious lava bug + renamed stuff