Fix typo, minor improvements