cleanup, fix default language