added
some refinements
Merge branch 'test-render'
cleanup