Made a few more bugs