Fixing incorrect default value
Removing null default - it is never called without and would cause an error in the Broken case
Only extract section of match that is used
Merge pull request #467 from ciaranmcnulty/bugfix-assorted-issues

Bugfix assorted issues