complex scenario eval and bugfixes
Update