reorder synthesizer; enable zita1 by default; more cleanups