Various fixes

* Fixed #121 
* Fixed localization
* Minor clean up