Improved the handling of commands in general, it's even nicer now