gh-2 mostly fixed

still shows stack, which is unnecessary in this case