Fix missing target types.
Update global dictionary.
Merge pull request #5 from Deathmax/master

syncing up with deathmax extracts