BUGFIX: variable/function naming mistakes
BUGFIX: mistranslated forms