fixed more errors, more results are correct now