clean up pipskin commands a little, rewrite mm