some fix and syntax review