Add Paula's commits 3-20-2012

Paula's commits had to be added again after commit reversions