Add a nicer find function at point, also some minor refactors