- many small fixes