Add to sprint 6, licenses, small fixes