Thanks 5of0. I think your plan is good, if you want I can try to test out your change as well.
Does anyone else have any more information on Issues #1 and #2? Maybe they were fixed at some point since they were from early in this thread.
For now I might tackle another simple one that I came across, #4, seems like we should be able to clean that up.