new part, small fixes