redo ls(), hidden params for ls(), more cleanup