Adding disclaimer and other adjustments