syntac correction and add some types