clean up world
misc update