Corrected time calculations, updated label