[FIX] all bugs & comments fixed