Fixed more stuff...