fix typos, change find methods, other minor nitpicks