made some index-erros