Move autoSingleton to a better place, implement Enumeration difference
Slightly better road rendering