more erros fixing