Revised a ton of stuff