Improvements from dylan.