various fixes + start cleaning up names for our localizers