fixed autofocus + minor adjustment to tags
merge