fixed several iterator issues, also already have heans sound fixed merged here, will show up in this commit