made a number of small fixes