Synth prototype fixes #16 fixes #20