ticket:13 fix some remarks