Fix red-pill when no UFO passed on command line

And some minor clean-up