Bug fix and legal document update