re formatted output and fixed links for fields