Support reference uri & fix gobs of C code

Can you explain why these changed from 2, 3 to -1?