Fixed more counting things

I lied, merged and did some more testing, added test2part2 for large
testing