fixed errors (hopefully)