Making small commits because the last larger one produced unexpected results.
Need to work up from these changes.
makefile change from before vacation