Added images, some refactoring, etc.