added hours and minutes
tweaked time calcuations