fixed preprocessing
fixed the script mapping to tokens
Merge branch 'SQL' into develop
Merge branch 'develop'