merged localization and fixed specs