watermarked images, square logo, updated todo