updated Tracy
other updates for 2.2