Updated lava class; separated calcs & draws