Demo bugfixes and QoL

[p]Pushed out two small updates today to address issues posted to the forum.[/p][p][/p]