final world and a few fixes