Fix: bugs that symbol table entry was not set
Mod: lots of update