Fixed more stuff, mostly minor changes