fixing the pass, also cmd bugs