Fixed a bunch of stupid CLI bugs.