Watermarking image + bugfixes
Chasing loose files