dump functionality done
several improvments