many small fixes