various changes (interprter / fn)