added more parsing of commands