Added some more figures
Added syntactic complexity feature
Merged/fixed conflicts with ZWD's changes, made the test_general_extraction a bit more verbose