Added templated finds & fixed bugs