Made the group option parsing handle a few edge cases