updated parsing for basic commands