Changed time from military time, minor style changes