Corrected language code, other minor changes, still unfinished