Fix date calculations, format graph prettily