Made most of the changes recommeneded in critiques today.