Options renamed and -H switch added.