Add handling of -v, -w and -h arguments