Fixed more errors; started with 500+ now at 96