Made auto-numbering work in more situations, fixed links for SOURCE