moved gen selector to front of analyzer, prevents shaping due to trigger, minor script updates