Thank you for the feedback!
1. This should be pretty easy to add
2. I noticed this myself when testing, though I'm going to need to change a few things to get this to work
