remade entire project for odd bugs