Next fixes
fix location
Make references local

About a 1000% faster when compiling the draft.
Local references