Added auto localization and fixed some bugs....