fixed every bug