take picture as comment & fix some bug

$15000