Fix parsing of commands. Also remove already done TODO entry