Fix the -2 option (getopts) and added the missing help around new opts