Minor optimizations and cleaning#1484

jobzteve wants to merge 2 commits intoLykosAI:mainLykosAI/StabilityMatrix:mainfrom

jobzteve:perfjobzteve/StabilityMatrix:perfCopy head branch name to clipboard