Updates citation finder to fix some bugs and to make it more OO.