Reviewed and improved the image-node part.