merge changes to debug mission
work on #418 and #417
fixes #419
fixes #418
work #417