Fix a bunch of errors, still not compiling