Added initial changes to conf file.
Reorganized code, and added some comments.
Merge branch 'master' into modular-pattern-match
Restructured code for modular pattern matching, results are better than before.