Lots of changes after a thorough exploration of the command line