Finish out the main features.
Results are confirmed for a sample file
Update error messages
bug in "if or"