more impovements, issue #311
improvements to --live-test