Engine output fixes, still more to come