fixed like a ton of things