fixes on #210 and in lang file security
fixes on #210 and more