clean up, final fixups and license additions