more fixes to elevator, ds enc code