bug fixes, restructuring output and update of meter
Authored by: ruckert 2009-07-17
Parent: [r16]
Child: [r18]