Rearranging translations and adding error codes.