minor changes in some methods,
correction of previous calculation
Authored by: juliakern 2013-08-22
Parent: [r25649]
Child: [r25651]