fix and licensing