#8 Minor tweaking as debugging continues