trips and small fixes