More localization

Note, not to sure if it all works, i did this under @mDiyo 's request