more performance tweaks, though the hrefs are still slowed down by the 300ms wait bug ...