rewrote it; CLI should be more usable now