More code, license and project cleanup.