Fixed typo and updated various changes