More Fields Localized. Also now saving data correctly.