Added images
Added images and various bugfixes