Minor improvements

Enhancements and fixed a typo in a method comment.