working
working on report
adding support for test scene, and fixing some minor issues