Further localization and fixed a few derps