[fix] added missing semicoln
[fix] various fixes about the function names and new flow