made some mistakes, fixing up everything