committing various changes before I try to implement pitch mod, which is super rad :P