Enchanced watermark, small bugfixes.