small improvements and better test scene