changed argument validation in commands