localize and fix

* done.(?)