Time left on cover
Merge both cover improvements into one

Took my idea of improving cover and merged it together with idea sent by
Gianguido Sorà. Hopefully the result does both and makes everybody happy :-)