Fixing legalese and adding comments