add javadoc comments and try new search methods