update to main and propagate, added license