added some bits and pieces