adjusted formats, added username to output.
fixed some formatting.