fixes from duketwo, thank you! https://github.com/ISeeDEDPpl/Questor/pull/489

misc additional fixes...