more changes to minimal and curried more engine functions where appropriate