Fix most stage stuff in cave generation