1. That's true. Nate and I thought it would be a good first approximation. I can update to use a tree.
2. I realized I forgot to change this right after I pushed. The fix is on my local right now with a couple other small fixes.