various changes to init & daq