Added -p (individual drafts) option