Fix numerous issues.. 50% faster, a lot less allocations