fix some errors and comments