Add more fields, and fix long output format