Adding dataset enumeration and improving some comments.