minor bugfixes, pitchs implemented but not tested