Some more Documentation and Logging