add pic and fix other