* tidy up translation module
* small bugfix in translation module