More work on cmd line stuff.