simple typo and enhancements