improved dump()
minor adjustments