trlte & jf updates

Good to merge