Fixing basement bugs
Fixing elevator jumping to basement
merge