Big improvements in manipulating path :P