Some further Engine Updates