More fixes. Now getting 58% for http://goo.gl/pJVAhf.