Commands now properly are parsed