work on issues # 218 and #214 had to commit early b/c found a live breakpoint that needed expunging.