Update 5-29-13 1031AM

Bunch of stuff