Working out a few bugs; example changed