fixed #818
fixed nl strings
fixed npe in block menu item
refactor swithOverToTls stuff