Optimized prealloc a little more (MUST TEST more)
Added important todo