some bugs in pictures are fixed