Added watermarking capabilities
Cleanup functions, add lazy loading where possible.