Fixed some more bugs

Now it's working