some changes in mapping, to make results better comparable + bug fix (bad style of coding)
Authored by: laemmel 2008-02-01
Parent: [r549]
Child: [r551]