Documentation and bug catch