Changed a shitload of things