Improved documentation, initial testing and changes for images.