- fix some errors