Fixed so it partially works
Fixed more stuff