Tweaks and updates from usage in the field.