Big refactor, polyphonic, .gitignore update
Minor correction.