new part and small fixes