Improved CLI display, fixed stupid bugs, added sane defaults