Awesome! Thank you so much for both of these! I'll fix them both in the next release.
Also a double thank you for taking so much care with spoilers!