DF-2765 clipping and a lot of various small fixes