fix errors  & add some