Unify commands, improve option parsing, fix bugs and introduce new ones