assorted tweaks

https://github.com/tommytarts/Quantum8/commit/2bb600fb68b37a992dcff4884c9ff7cce71be3cd