code review before 0.9.8.0