Fixed typo and other small improvements