Updated printing output and added single hypen command line switches. Also fixed a bug in the time format strings