solve some problems and add some annotations