June updates

Major changes to trap_knobs and post_process_trap.