atg. fix bugs, remove package.name from translator code.