autofocus and other minor cosmetic changes