Changed regex for bool_argument, and changed test for bool argument accordingly
Added keywords
Made changes to argument list for some keywords
Changed group for some keywords