Updated language; bugfixes