fixed some more type errors with workarounds. 2 left.