Fixing even more errors, 16 left