Some adjustments suggested by autoupdate and autoscan were added.