Suggestfixed

This branch is rebased and includes fixes from review by @chromakode.  I believe he is still reviewing that one, and the rebase would blow it up.  So, new branch.