Fixed more bugs and stuff