Switched to hash based links, bugfixes and performance tweaks