A few cosmetic changes, license, copyrights, etc