Tweaks + updated allocator to skip already allocated IDs