Fixed garbage collection.
Try to handle roll.
Minor tweak.