Updated all recent modifications. Let's Kick this puppy into gear.