Better error management
Update libs