Ok, will need to add a few warnings the for the BTi raws since we still did not figure out how to properly include the refs. Maybe it's worth resuming the effort as you now fixed some bugs.