Speed improvements (10000ms -> 9000ms for test03 on my mac, YAY! xD)