also some mistakes