Consistent return codes
Update simulation script