Added images and various bugfixes