parsing working & some error fixes