most errors fixed