more fixes for the allocator, looking pretty good now :)