Minor validation added plus texts fixed