fixed uuid, other fix still in progress