Speed improvements (and somewhere along the way Jonathon's reported bug resolved itself?)