smaller world, some improvements