Followup from review.
Radically simpler command line stuff as there is no properties involved any more
Much more javadoc