Cleanup and updated legal notes.