Fix typo
Several minor updates