Fix logic so we actually find the right acronyms, and pep8-ify
PEP8-ify
PEP8-ify
Fix supervision logic and PEP8-ify