Error & some data fixes