just some cleanup
Merge branch 'fixsynth'
just a simple merge