Some fixes

Committing now as I need to use another branch
LIDO generation

To finish tomorrow