More watermark positions, some code clarifications.