Add summary after import
Small fixes and cleanup.