Performance tweaks, starting to test with Web Polygraph