Made extra dictionary more language independent.

Minor adjustments to the makefile.