Improved CLI and output. Still beta.