adding autofocus and other small changes