update and fix some errors