Added a few more bits and pieces.