Fixes duplicate fields, makes function public and fixes some translation errors