fix missspelling(flicrk_id -> flickr_id), seperate watermark and flickr upload.