Writing more doc strings etc.