fix passed fn names and evaluation