fix some errors
Gerard check