Thanks for the report @Octobadger - I have a fix brewing for part of the issue
Working on the other (and much harder) part