Typo fixed + Some improvements