Bug corrections and improvements to the finder.