Fixed a few bugs and doing localizations