support for imports, requireNonNull, N/A in config + misc refac