Code

user manual: answer some comments from Junio