re-did language files and simplified