Changed links to references, small tweaks