more debug fixes

few more tests and we're on to exec part