Last adjustments and data definitions added

I just make some last adjustment and data definitions. Check it before we submit.