Fixed some more bugs, that should work now