Changed a ton o' stuff