small fixes 2nd