Rewritten parsing commands
Some fixes