More cleanup, fix some bugs, separate test CLI
Make CLI a little more friendly
Check for superko violations