Some clean up. Fixes rec functions to fail recursion. Run all from one file.