[WIP] Tidy up Overlay members
[FOLD] Correct handling of Overlay timer