Fix for moved functions.
Code cleanup
Updated translations.