Updating some bits and pieces