Added assorted bits and pieces