Fixed ElevatorThread, other small changes