Removed dump() function.
More fixes.