Lots of updates to the translator in the root directory. Added a couple of entities to smooth out translation.