Bug fix, cleaner output, better listing.