improve handling of auto-imports
externalize some strings