Rushed Edits

I really didn't have time to properly test this. If it looks rushed, its cause it is.