Fixed ad a ton of stuff