Some debugging updates and documentation updates