Update and fix erros