lots of little updates to get the ExPo1 family fixed and cleaned up