Version presented to DHS: cleanup, interface improvements, etc.