Add watermark and drawtext descriptions, plus some random fixes.