Fixed more bugs and shit.