updating some bits and pieces