License fix and some todo resolves