Refactor, other stuff. Perplexing errors; going to go back in time to see when they started happening.
Debugged the refactor of multiple return value fixing.