Add collapsed and full reference links
Small bugfixes