Correction

Changes in the design and typo's