few updates to tracking lib ... etc