small improvements and better test scene
small improvements and better test scene