More command parsing.
Fixed(?) CommandParser.