fix typos
fix test-cut
drop x,y,z from commands
cleanup and fix tests