multisite fixes

I have no internet here so I merged lot of stuff to 1 commit

= Localization fixes
= General cleanup and stability fixes