Improve commandline args.

And restore the wallpaper after a change.