Tons of bug fixes. Still more to do, but making good progress.
needed to add one more file.