fixed several bugs
new picture
updated methods