Created by: didi-hou
Code improvement including the renaming of some functions, modules, texts and code comments;
Bug fixes.