passenger and small fixes