Add images
Fixed some bugs
Fixed bugs 2