That helped a ton and I have resolved both of those listed issues. Thank you for the detailed report and bug testing! Hotfix is pending.
