major scan improvements