General clean-up, switch default command-line interface to show all,
more goals in TODO