javadocs updated and search bugs possibly fixed