Fix some errors and fix elevator pick.