A bunch of changes as the command line now works.