class name and comment changes
demo includes random
minor text change