"Did end display" updates

Review @confucious 

Not certain this was all worth it but it's done now...