many small fixes.