fix picture bugs, remove addPlan1, fix client bugs