Added a few fixes. Now ready to start on allocator