Bugfix and preparation patch

Small bugfix patch in preparation for the big update.
Nothing too big.
Thank you for reading though! Have a good day!

-Bal