More Documentation and Testing