Added dump and finished final touches