...
more testing, changes to logs, etc.