added more fields to output, need to fix encoding